Skip to content

Update Fix - #189

Open
iamsam2e wants to merge 2 commits into
trunkfrom
update/145-rebase-poetry
Open

Update Fix#189
iamsam2e wants to merge 2 commits into
trunkfrom
update/145-rebase-poetry

Conversation

@iamsam2e

Copy link
Copy Markdown
Collaborator

Rebased from PR 145, to resolve issues for the 404 template as suggested my MC as well as resolving accidental push onto the existing #145 branch

this resolves both #144 and #145

Rebased from PR 145, to resolve issues for the 404 template as suggested my MC as well as resolving accidental push onto the existing #145 branch

this resolves both #144 and #145
@github-actions

github-actions Bot commented May 30, 2024

Copy link
Copy Markdown

Preview changes

I've detected changes to the following themes in this PR: Archivist, Blue Note, Poetry, Term, Purr, Atlas.

You can preview these changes by following the links below:

I will update this comment with the latest preview links as you push more changes to this PR.

⚠️ Note: The preview sites are created using WordPress Playground. You can add content, edit settings, and test the themes as you would on a real site, but please note that changes are not saved between sessions.

⚠️ Note: Child themes are dependent on their parent themes. You will have to install the parent theme as well for the preview to work correctly.

Comment thread poetry/templates/404.html Outdated
@@ -1,3 +1,34 @@
<<<<<<< HEAD

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is a conflict :D

@iamsam2e

Copy link
Copy Markdown
Collaborator Author

Going to try to address this this week! :)

Using the GH CLI I think I have resolved the conflicts here.
@MaggieCabrera

Copy link
Copy Markdown
Collaborator

I like the design and the text, but why are we making another header? do we think it's going to be one we want to reuse for other templates? Also, it might be time to move the parts that have text into a pattern for internationalization (there's more info on the readme file and you can use blue note as a reference)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants